From: jave <joakim@verona.se>
Date: Wed, 31 Dec 2014 11:24:10 +0000 (+0100)
Subject: merge upstream
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=baba9e039136e183e055169ddd7ca1e983fc734f;p=emacs.git

merge upstream
---

baba9e039136e183e055169ddd7ca1e983fc734f